merge emacs-24
authorKenichi Handa <handa@gnu.org>
Wed, 28 Nov 2012 11:58:44 +0000 (20:58 +0900)
committerKenichi Handa <handa@gnu.org>
Wed, 28 Nov 2012 11:58:44 +0000 (20:58 +0900)

Trivial merge